Merge branch 'MDL-53417-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Apr 2016 15:36:50 +0000 (16:36 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Apr 2016 15:36:50 +0000 (16:36 +0100)

Trivial merge