comment on cookie handling
okapi r869: protection areas
Merge branch 'stable'
Merge branch 'master' into next