(über-minor: build/ added to gitignore)
Merge branches 'master' and 'unstable' into unstable