Merge branch 'MDL-54765-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Jun 2016 08:41:27 +0000 (09:41 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Jun 2016 08:41:27 +0000 (09:41 +0100)

Trivial merge