Merge branch 'MDL-62519_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jun 2018 02:33:52 +0000 (10:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jun 2018 02:33:52 +0000 (10:33 +0800)

Trivial merge