Merge branch 'wip-MDL-59523-master-fix' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Aug 2017 02:47:52 +0000 (10:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Aug 2017 02:47:52 +0000 (10:47 +0800)

Trivial merge