Tweak for session changes.
Fix comments on session.
Added "cookie" back in as session option.
Setup Patchwork for 1.1.*.
Merge remote-tracking branch 'upstream/develop' into develop