Merge branch 'MDL-56573-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 04:03:00 +0000 (12:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 04:03:00 +0000 (12:03 +0800)

Trivial merge