Merge #2702 into Revit2015