Merge branch 'MDL-54984-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Jul 2016 08:52:42 +0000 (09:52 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Jul 2016 08:52:42 +0000 (09:52 +0100)

Trivial merge