Fix use strict at file scope, thanks to ideas from @pornel
Merge branch 'master' into harmony

* master:
  Fix use strict at file scope, thanks to ideas from @pornel