Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 7 Aug 2015 19:16:46 +0000 (22:16 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 7 Aug 2015 19:16:46 +0000 (22:16 +0300)

Trivial merge