Merge branch 'MDL-48778-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Feb 2016 17:13:02 +0000 (17:13 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Feb 2016 17:13:02 +0000 (17:13 +0000)

Trivial merge