This fixes #8350.
Fixed a merge.
Merge branch 'master' of github.com:hugllc/Timeclock