Timeout and login limit

Merged Sean Lacey requested to merge Timeout_and_Login_Limit into master

Merge request reports