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