merge #2706 to Revit 2015 branch.