Merge remote-tracking branch 'origin/master'
authorAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Thu, 30 Oct 2014 12:47:09 +0000 (15:47 +0300)
committerAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Thu, 30 Oct 2014 12:47:09 +0000 (15:47 +0300)

Trivial merge