Merge branch 'refs/heads/develop'
Fixed a bug with cookies

Signed-off-by: John Snyder <juven14@gmail.com>