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

Trivial merge