Merge branch 'MDL-60667_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Nov 2017 05:27:11 +0000 (13:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Nov 2017 05:27:11 +0000 (13:27 +0800)

Trivial merge