Merge branch 'MDL-60506-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Oct 2017 05:37:09 +0000 (13:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Oct 2017 05:37:09 +0000 (13:37 +0800)

Trivial merge