Merge branch 'master_MDL-58080' of https://github.com/danmarsden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Mar 2018 06:08:16 +0000 (14:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Mar 2018 06:08:16 +0000 (14:08 +0800)

Trivial merge