Merge branch 'MDL-57546-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 12:10:19 +0000 (14:10 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 12:10:19 +0000 (14:10 +0200)

Trivial merge