Merge branch 'MDL-59988_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Oct 2017 00:19:06 +0000 (08:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Oct 2017 00:19:06 +0000 (08:19 +0800)

Trivial merge