Merge branch 'MDL-59642-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 12:41:32 +0000 (14:41 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 12:41:32 +0000 (14:41 +0200)

Trivial merge