Fix cookies for Chrome
Merge branch 'r1411'