Merge branch 'MDL-58463-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Apr 2017 17:53:51 +0000 (18:53 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Apr 2017 17:53:51 +0000 (18:53 +0100)

Trivial merge