Merge remote-tracking branch 'origin/master'
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Thu, 26 Feb 2015 14:14:40 +0000 (17:14 +0300)
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Thu, 26 Feb 2015 14:14:40 +0000 (17:14 +0300)

Trivial merge