This fixes #8388.
Merge branch 'master' of github.com:hugllc/Timeclock