Sam Aaron Merge

Brings into line with Sam Aaron's master