Merge branch 'MDL-62543-master' of git://github.com/tobiasreischmann/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 28 May 2018 00:53:41 +0000 (08:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 28 May 2018 00:53:41 +0000 (08:53 +0800)

Trivial merge