Merging master into develop.

This applies the fix to Mason2 (and Dave's subsequent fix of my patch).