Cross merging master changes into Revit 2015

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