Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 29 Sep 2015 19:56:19 +0000 (22:56 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 29 Sep 2015 19:56:19 +0000 (22:56 +0300)

Trivial merge