Merge branch 'MDL-54994' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 13:18:15 +0000 (14:18 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 13:18:15 +0000 (14:18 +0100)

Trivial merge