Merge remote-tracking branch 'origin/master' rubymine/163.1079
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 7 Jul 2016 13:44:13 +0000 (15:44 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 7 Jul 2016 13:44:13 +0000 (15:44 +0200)

Trivial merge