Merge master  to Revit2015 branch

Merge #3315 & #3270