Merge branch 'master_MDL-57486' of https://github.com/danmarsden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 May 2018 00:31:12 +0000 (08:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 May 2018 00:31:12 +0000 (08:31 +0800)

Trivial merge