Freshening
Merge branch 'master' into osx
Freshening