Merge branch 'MDL-62515-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 28 May 2018 04:27:45 +0000 (12:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 28 May 2018 04:27:45 +0000 (12:27 +0800)

Trivial merge