Merge branch 'MDL-55273-cookie-secure-default' of https://github.com/brendanheywood...
authorDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 14:25:15 +0000 (15:25 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 14:25:15 +0000 (15:25 +0100)

Trivial merge