Merge remote-tracking branch 'origin/master'
authorIvan Chirkov <Ivan.Chirkov@jetbrains.com>
Wed, 27 May 2015 12:24:56 +0000 (14:24 +0200)
committerIvan Chirkov <Ivan.Chirkov@jetbrains.com>
Wed, 27 May 2015 12:24:56 +0000 (14:24 +0200)

Trivial merge