Merge branch 'MDL-64747-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 13 Mar 2019 06:28:04 +0000 (14:28 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 13 Mar 2019 06:28:04 +0000 (14:28 +0800)

Trivial merge