Syn'ing latest between dev and master

Syn'ing latest between dev and master. Gradually moving to Dev as the main development target, but while we do this, will sync things cross.