Merge branch 'MDL-58803-master-fix' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 06:11:23 +0000 (14:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 06:11:23 +0000 (14:11 +0800)

Trivial merge