Merge branch 'MDL-59666-master-fix' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Aug 2017 04:54:27 +0000 (12:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Aug 2017 04:54:27 +0000 (12:54 +0800)

Trivial merge