Merge branch 'MDL-60801' of https://github.com/andrewhancox/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Dec 2017 04:48:52 +0000 (12:48 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:32 +0000 (19:53 +1300)

Trivial merge