Merge pull request #3095 from Benglin/Revit2015

Cross merging master changes into Revit 2015
Cross merging master changes into Revit 2015