Merge branch 'MDL-56323-master' of git://github.com/l-campbell/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Nov 2016 05:12:07 +0000 (13:12 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 2 Nov 2016 05:12:07 +0000 (13:12 +0800)

Trivial merge