Merge master  to Revit2015 branch

Merge #3325 to Revit2015