Fixed a minor crash on builds which don't have a time
Merge branch 'staging' into ldap_login