Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 11 Aug 2015 14:42:58 +0000 (17:42 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 11 Aug 2015 14:42:58 +0000 (17:42 +0300)

Trivial merge