cross merge #2813 to Revit 2015 branch.

cross merge #2813 to Revit 2015 branch.