Merge Beng's pull request #3295 into Revit 2015