Merge branch 'master' into unstable and then unstable into master

`git merge -s ours master` => allows for clean merge of unstable into master, using exactly what's on unstable to avoid conflicts:

git checkout unstable

git merge -s ours master

git checkout master

git merge unstable