Merge branch 'MDL-59237-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Jul 2017 11:15:52 +0000 (12:15 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Jul 2017 11:15:52 +0000 (12:15 +0100)

Trivial merge