Merge branch 'MDL-60433-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Oct 2017 12:23:35 +0000 (13:23 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Oct 2017 12:23:35 +0000 (13:23 +0100)

Trivial merge