Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 27 Aug 2015 17:11:08 +0000 (20:11 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 27 Aug 2015 17:11:08 +0000 (20:11 +0300)

Trivial merge