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