Merge the master branch into the Revit2015 branch

@lukechurch 

This submission merges the master branch into the Revit2015 branch.