Merge branch 'adamcharnock-manage' of https://github.com/adamcharnock/intellij-community