Merge branch 'MDL-55491-master' of git://github.com/sarjona/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Apr 2018 15:53:37 +0000 (17:53 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Apr 2018 15:53:37 +0000 (17:53 +0200)

Trivial merge