Merge branches 'evagl/included-from' and 'master' of git.labs.intellij.net:idea/commu...