Merge branch 'MDL-59041-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 May 2017 13:05:13 +0000 (14:05 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 May 2017 13:05:13 +0000 (14:05 +0100)

Trivial merge