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

Trivial merge