Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Thu, 2 Jul 2015 10:47:15 +0000 (13:47 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Thu, 2 Jul 2015 10:47:15 +0000 (13:47 +0300)

Trivial merge