Merge branch 'master_MDL-44712' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 09:33:31 +0000 (10:33 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 09:33:31 +0000 (10:33 +0100)

Trivial merge