Merge branch 'MDL-57957' of https://github.com/bostelm/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 22 May 2017 02:41:46 +0000 (10:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 May 2017 02:41:46 +0000 (10:41 +0800)

Trivial merge