Merge branch 'MDL-55163-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 17:42:46 +0000 (19:42 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 17:42:46 +0000 (19:42 +0200)

Trivial merge