Merge branch 'develop' into issue-47-A_cookie_request_thing_should_be_present_but_in_a_non-annoying_way