Merge branch 'MDL-55815' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 07:27:58 +0000 (08:27 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 07:27:58 +0000 (08:27 +0100)

Trivial merge