Merge branch 'wip-MDL-61322-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Mar 2018 02:57:36 +0000 (10:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Mar 2018 02:57:36 +0000 (10:57 +0800)

Trivial merge