Merge branch 'master_MDL-63953' of https://github.com/danmarsden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Nov 2018 23:47:45 +0000 (07:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Nov 2018 23:47:45 +0000 (07:47 +0800)

Trivial merge