Updating .gitignore
Merge branch 'master' into debian
Merge branch 'master' into debian
Updating .gitignore, adding debian/keyringer.substvars
Removing debian/keyringer.substvars from version control
Merge branch 'master' into debian