This should fix #7802.
Merge branch 'master' of github.com:hugllc/Scripts