Merge branch 'MDL-58857-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 10 May 2017 05:50:10 +0000 (13:50 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 10 May 2017 05:50:10 +0000 (13:50 +0800)

Trivial merge