Merge branch 'MDL-18599-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 13:59:44 +0000 (15:59 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 13:59:44 +0000 (15:59 +0200)

Trivial merge