Merge from master to Revit2015 branch