Migrating a missed changeset from svn to git
Adding ignore file
Merge branch 'master' into jan_r2