Merge branch 'MDL-60003_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Oct 2017 12:18:21 +0000 (20:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Oct 2017 12:18:21 +0000 (20:18 +0800)

Trivial merge