Fix cookieOptions plugin bug
Merge branch 'master' into hbsfy