Merge pull reqest #2538 into Revit2015

This is to merge pull request #2538 into Revit 2015 branch.