Merge branch 'adamcharnock-manage' of https://github.com/adamcharnock/intellij-community
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 3 Oct 2016 16:46:05 +0000 (19:46 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 3 Oct 2016 16:46:05 +0000 (19:46 +0300)

Trivial merge