Summary of changes: b7fd0b3... remove session timeout settings from general (*) fe8e76d... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent