Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 05:20:42 +0000 (13:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 05:20:42 +0000 (13:20 +0800)

Trivial merge