Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 03:56:06 +0000 (11:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 03:56:06 +0000 (11:56 +0800)

Trivial merge