Merge branch 'MDL-56516-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 07:41:34 +0000 (15:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 07:41:34 +0000 (15:41 +0800)

Trivial merge