Merge branch 'MDL-58916-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 10:01:13 +0000 (11:01 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 10:01:13 +0000 (11:01 +0100)

Trivial merge