Merge branch 'MDL-61513-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Mar 2018 04:25:59 +0000 (12:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Mar 2018 04:25:59 +0000 (12:25 +0800)

Trivial merge