Merge branch 'MDL-61260_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Jan 2018 09:17:39 +0000 (10:17 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:15 +0000 (10:33 +0800)

Trivial merge