Merge branch 'MDL-63050-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 15 Aug 2018 02:59:37 +0000 (10:59 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 15 Aug 2018 02:59:37 +0000 (10:59 +0800)

Trivial merge