Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 5 Aug 2015 20:48:41 +0000 (23:48 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 5 Aug 2015 20:48:41 +0000 (23:48 +0300)

Trivial merge