Merge branch 'MDL-58573-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 28 Apr 2017 03:46:02 +0000 (11:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 28 Apr 2017 03:46:02 +0000 (11:46 +0800)

Trivial merge