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

Trivial merge