Changes per msg135532
Merge remote branch 'origin/master'