Merged from upstream/master
Removed idea related config files from commit message.