Merge from Sams master into mine

Yep