Cross merging master changes into Revit 2015
Merge pull request #3096 from Benglin/Revit2015

Cross merging master changes into Revit 2015