Merge branch 'MDL-56675-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 4 May 2017 05:32:59 +0000 (13:32 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 4 May 2017 05:32:59 +0000 (13:32 +0800)

Trivial merge