update to using new globals
yet another forgotten universals update
Merge branch 'master' into stable