Merge branch 'MDL-53996-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 2 May 2016 02:51:59 +0000 (10:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 2 May 2016 02:51:59 +0000 (10:51 +0800)

Trivial merge