Cross merge to Revit2015

Fix check for global scope