Merge branch 'master' into eos-noon

Procedure for swapping eos-noon into master.
- git checkout eos-noon
- git merge -s ours master <-this is where we are right now
- git checkout master
- git merge -X theirs eos-noon