Fixing errors created in build.
Merge remote-tracking branch 'origin/issue-343-military-time' into issue-343-military-time