Merge branch 'MDL-55916-maintmode-503-moodle' of https://github.com/brendanheywood...
authorDan Poltawski <dan@moodle.com>
Tue, 20 Sep 2016 08:31:41 +0000 (09:31 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Sep 2016 08:31:41 +0000 (09:31 +0100)

Trivial merge