Merge branch 'MDL-61951-master' of git://github.com/sarjona/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 11 May 2018 02:18:58 +0000 (10:18 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 11 May 2018 02:18:58 +0000 (10:18 +0800)

Trivial merge