Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 4 Sep 2015 13:57:26 +0000 (16:57 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 4 Sep 2015 13:57:26 +0000 (16:57 +0300)

Trivial merge