Merge branch 'master' of https://github.com/jvgogh/intellij-community into jvgogh...
authorpeter <peter@jetbrains.com>
Wed, 9 Nov 2016 14:46:34 +0000 (15:46 +0100)
committerpeter <peter@jetbrains.com>
Wed, 9 Nov 2016 14:46:34 +0000 (15:46 +0100)

Trivial merge