Merge the master branch into the Revit2015 branch