Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 3 Sep 2015 18:03:25 +0000 (21:03 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 3 Sep 2015 18:03:25 +0000 (21:03 +0300)

Trivial merge