Merge branch 'MDL-60631_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Oct 2017 04:08:01 +0000 (12:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Oct 2017 04:08:01 +0000 (12:08 +0800)

Trivial merge