Merge branch 'MDL-59366-master-fix' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 Aug 2017 01:23:26 +0000 (09:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 Aug 2017 01:23:26 +0000 (09:23 +0800)

Trivial merge