merge #2817 to Revit 2015 branch.