Lots of new stuff
Merge branch 'master' into osx