Merge master changes into Revit2015

Cross merge changes from [this pull request](https://github.com/DynamoDS/Dynamo/pull/2479).