Fix EduEdition build (take 4)
Merge remote-tracking branch 'origin/master'
IDEA-128212 Alt+Click shows two popups