Try to fix windows build.  Refs #6737.
Merge branch 'feature/6737_correct_logtime' into develop