Allow login to work with a null last login date
Merge remote-tracking branch 'origin/develop' into develop