Merge branch 'MDL-59866' of https://github.com/marcusboon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Dec 2017 05:46:07 +0000 (13:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Dec 2017 05:46:07 +0000 (13:46 +0800)

Trivial merge