Merge branch 'MDL-55376-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 15:07:00 +0000 (16:07 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 15:07:00 +0000 (16:07 +0100)

Trivial merge