Merge remote-tracking branch 'origin/master'
authorIvan Chirkov <Ivan.Chirkov@jetbrains.com>
Fri, 29 May 2015 15:41:08 +0000 (17:41 +0200)
committerIvan Chirkov <Ivan.Chirkov@jetbrains.com>
Fri, 29 May 2015 15:41:08 +0000 (17:41 +0200)

Trivial merge