Merge branch 'MDL-58538-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 20 Apr 2017 07:26:54 +0000 (08:26 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 20 Apr 2017 07:26:54 +0000 (08:26 +0100)

Trivial merge