Merge PR #311 (https://github.com/JetBrains/intellij-community/pull/311)
authorDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Mon, 28 Mar 2016 11:03:34 +0000 (14:03 +0300)
committerDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Mon, 28 Mar 2016 11:03:34 +0000 (14:03 +0300)

Trivial merge