naught
Merge branch 'master' into naught
naught conversions include minor cleanup