Merge branch 'master' into develop
Moved js config settings to head.
Can't move settings to head. Variables aren't set yet.
Cookie can accept multiple values.
Logging.