Cross merging master changes into Revit 2015

Cross merging another [reviewed pull request](https://github.com/DynamoDS/Dynamo/pull/2624).