Merge branch 'MDL-54073-master-2' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 13 May 2016 06:45:24 +0000 (14:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 13 May 2016 10:12:33 +0000 (18:12 +0800)

Trivial merge