Merge branch 'mdl-54852-master' of https://github.com/Dagefoerde/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Nov 2016 05:07:26 +0000 (13:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Nov 2016 05:07:26 +0000 (13:07 +0800)

Trivial merge