Merge branch 'MDL-58567-master-fix' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Jun 2017 14:14:30 +0000 (15:14 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Jun 2017 14:14:30 +0000 (15:14 +0100)

Trivial merge