Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 31 Aug 2015 17:28:51 +0000 (20:28 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 31 Aug 2015 17:28:51 +0000 (20:28 +0300)

Trivial merge