Merge branch 'MDL-58581-master-take2' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 26 Apr 2019 04:03:33 +0000 (12:03 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 26 Apr 2019 04:03:33 +0000 (12:03 +0800)

Trivial merge