Fix SafeGlobal
Merge branch '0.3-maintenance'