Cross merge pull request 3288 to DynamoRevit2015

#3288 is merged to DynamoRevit2015