Merge branch 'MDL-58617-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 20 Apr 2017 06:19:17 +0000 (07:19 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 20 Apr 2017 06:19:17 +0000 (07:19 +0100)

Trivial merge