Merge branch 'wip-MDL-55707-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Sep 2016 02:46:57 +0000 (10:46 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Sep 2016 02:46:57 +0000 (10:46 +0800)

Trivial merge