Merge branch 'extended-cookie'

Benjamin Mako Hill || Want to submit a patch?