Merge branch 'wip-MDL-60268-master' of https://github.com/Beedell/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 12 Oct 2017 05:44:16 +0000 (13:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 12 Oct 2017 05:44:16 +0000 (13:44 +0800)

Trivial merge