Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 24 Aug 2015 19:41:31 +0000 (22:41 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 24 Aug 2015 19:41:31 +0000 (22:41 +0300)

Trivial merge