Merge branch 'MDL-65928-master-2' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 17 Jul 2019 02:21:37 +0000 (10:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 17 Jul 2019 02:21:37 +0000 (10:21 +0800)

Trivial merge