Merge remote-tracking branch 'kanzure/master' into nuke-globals
compare.sh: diff -u