Merge Ben's PR #3295 into Revit 2015