Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 7 Feb 2017 10:50:13 +0000 (13:50 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 7 Feb 2017 10:50:13 +0000 (13:50 +0300)

Trivial merge