Putting default timeout into a python variable
Merge branch 'master' into parent-callback

Conflicts:
	ut_relogin/templates/ut_relogin/redirected.html