Merge branch 'MDL-59369-master-fix' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Jul 2017 03:34:43 +0000 (11:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Jul 2017 03:34:43 +0000 (11:34 +0800)

Trivial merge