Merge branch 'master_MDL-55820' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Sep 2016 10:32:19 +0000 (11:32 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Sep 2016 10:32:19 +0000 (11:32 +0100)

Trivial merge