cross merge #2816 to Revit 2015 branch.

cross merge #2816 to Revit 2015 branch.