Remove *.def from .gitignore
Merge branch 'master' into buildsystem