Merge pull request #2731 to Revit2015 branch