Merge branch 'MDL-59668_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 06:22:01 +0000 (08:22 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 06:22:01 +0000 (08:22 +0200)

Trivial merge