Merge branch 'MDL-55857-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 25 Nov 2016 00:46:04 +0000 (08:46 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 25 Nov 2016 00:46:04 +0000 (08:46 +0800)

Trivial merge