Merge branch 'MDL-64198-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 5 Dec 2018 06:30:16 +0000 (14:30 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 5 Dec 2018 06:30:16 +0000 (14:30 +0800)

Trivial merge