Merge branch 'MDL-56843-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Nov 2016 00:48:22 +0000 (08:48 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Nov 2016 00:48:22 +0000 (08:48 +0800)

Trivial merge