Updates to master

Glob imports and macros now require explicit allowance.