Session timeout set to 3 hours.. maybe?
Merge remote-tracking branch 'origin/master'