Merge branch 'MDL-54019_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 15:56:56 +0000 (16:56 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 15:56:56 +0000 (16:56 +0100)

Trivial merge