Removed cookie expiration stuff
Merging
Merging