Merge branch 'MDL-60718-master' of git://github.com/sarjona/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 9 Nov 2017 08:27:01 +0000 (09:27 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 9 Nov 2017 08:27:01 +0000 (09:27 +0100)

Trivial merge