Cross merging master changes into Revit 2015

See [the previous pull request](https://github.com/DynamoDS/Dynamo/pull/2609) for more details.