Merge branch 'MDL-57017-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Nov 2016 04:40:26 +0000 (12:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Nov 2016 04:40:26 +0000 (12:40 +0800)

Trivial merge