Specify session timeout in minutes
Merge branch 'postgres' into postgres-fay