Merge branch 'MDL-62535-master-fix' of github.com:abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 30 Aug 2018 05:49:15 +0000 (13:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 30 Aug 2018 05:49:15 +0000 (13:49 +0800)

Trivial merge