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

Trivial merge