Update corresponding to main changeset 72503

https://metanumerics.codeplex.com/SourceControl/changeset/72503