Merge branch 'master' into dany/grails-project-view
authorDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Mon, 1 Aug 2016 17:28:32 +0000 (20:28 +0300)
committerDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Mon, 1 Aug 2016 17:28:32 +0000 (20:28 +0300)

Trivial merge