Improve .gitignore
COMMONS-190: merge master into feature branch