This fixes #8418.
Merge branch 'master' of github.com:hugllc/Scripts