Cross merge PR #2419 from "master" into "Revit2015"

The original changes can be found here in [this pull request](https://github.com/DynamoDS/Dynamo/pull/2419).