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