Merge branch 'MDL-58623_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 20 Apr 2017 08:08:52 +0000 (16:08 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 20 Apr 2017 08:08:52 +0000 (16:08 +0800)

Trivial merge