reformats a bit
Merge branch 'master' into mac-osx