Session timeout extended to 3 hrs
Merge remote-tracking branch 'origin/master'