Merge pull request #2606 into Revit2015

@Benglin for review :-)