Merge branch 'MDL-63241-master-take2' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 9 Oct 2018 04:49:07 +0000 (12:49 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 9 Oct 2018 04:49:07 +0000 (12:49 +0800)

Trivial merge