Fixing IntelliJ files.
Merge branch 'master' into Debug