Merge branch 'MDL-57015' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 12:23:20 +0000 (20:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 12:23:20 +0000 (20:23 +0800)

Trivial merge