Merge branch 'ignore_intellij_files' into 'master'