Merge branch 'MDL-58833-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 10 May 2017 06:07:46 +0000 (14:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 10 May 2017 06:07:46 +0000 (14:07 +0800)

Trivial merge