Merge branch 'master' of git.labs.intellij.net:idea/community
authorTagir Valeev <Tagir.Valeev@jetbrains.com>
Wed, 7 Sep 2016 09:14:27 +0000 (16:14 +0700)
committerTagir Valeev <Tagir.Valeev@jetbrains.com>
Wed, 7 Sep 2016 09:14:27 +0000 (16:14 +0700)

Trivial merge