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

Trivial merge