Cross merging master changes into Revit 2015

Please see [the previous pull request](https://github.com/DynamoDS/Dynamo/pull/2631) for review details.