Merge branch 'MDL-55668-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Aug 2016 02:26:51 +0000 (10:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Aug 2016 02:26:51 +0000 (10:26 +0800)

Trivial merge