Cross-merge from master into Revit2015 for PR #2988