60 second idle wait on login screen
Merge branch 'master' into niallsull