Updates submitted from 1.4

All cosmetic
Merge branch 'master' into Mac