Cross merging master changes into Revit 2015

Please refer to [the original pull request](https://github.com/DynamoDS/Dynamo/pull/2947) for review details.