Disable SESSION_COOKIE_AGE refs #278
Merging upstream master