Merge branch 'MDL-47114-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Dec 2017 01:51:37 +0000 (09:51 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:30 +0000 (19:53 +1300)

Trivial merge