Merge branch 'MDL-51242-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 18:40:35 +0000 (02:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 18:40:35 +0000 (02:40 +0800)

Trivial merge