Cross merge pull request #2696 into Revit2015

@Benglin pls. 

The original pull request is #2696