Merge branch 'MDL-66336_master' of https://github.com/marxjohnson/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 21 Aug 2019 14:41:41 +0000 (22:41 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 21 Aug 2019 14:41:41 +0000 (22:41 +0800)

Trivial merge