Implement Issue #494
Update Issue #494
Merge branch 'master' into topic_user_idle_timeout
Update Issue #494
Merge pull request #495 from acinelli/topic_user_idle_timeout

Implement Issue #494 - User timeout admin setting