Merge branch 'wip-MDL-56829-master-2' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Nov 2016 02:05:16 +0000 (10:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Nov 2016 02:05:16 +0000 (10:05 +0800)

Trivial merge