Merge branch 'MDL-53765-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 12:56:49 +0000 (13:56 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 12:56:49 +0000 (13:56 +0100)

Trivial merge