Merge branch 'MDL-62268-master' of git://github.com/bmbrands/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 2 May 2018 02:12:32 +0000 (10:12 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 2 May 2018 02:12:32 +0000 (10:12 +0800)

Trivial merge