Merge remote-tracking branch 'origin/master'
authorAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Fri, 17 Oct 2014 16:42:42 +0000 (20:42 +0400)
committerAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Fri, 17 Oct 2014 16:42:42 +0000 (20:42 +0400)

Trivial merge