Merge branch 'MDL-62413-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 May 2018 02:16:27 +0000 (10:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 May 2018 02:16:27 +0000 (10:16 +0800)

Trivial merge