Merge branch 'MDL-55041_master' of https://github.com/marxjohnson/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 11:45:55 +0000 (12:45 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 11:45:55 +0000 (12:45 +0100)

Trivial merge