Merge branch 'MDL-54546-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 12 May 2016 12:58:08 +0000 (13:58 +0100)
committerDavid Monllao <davidm@moodle.com>
Fri, 13 May 2016 10:11:29 +0000 (18:11 +0800)

Trivial merge