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