Merge branch 'MDL-56380_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 02:04:45 +0000 (10:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 02:04:45 +0000 (10:04 +0800)

Trivial merge