Build still broken: Remove all traces of cookies
Merge branch 'devel'