Handle deprecated way of setting globals using 'predef' as an array
Merge branch 'master' into on-save