Merge branch 'MDL-55128-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jul 2016 12:33:23 +0000 (13:33 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Jul 2016 12:33:23 +0000 (13:33 +0100)

Trivial merge