Merge branch 'MDL-52568_master' of https://github.com/kevin-bruton/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Jan 2016 16:48:11 +0000 (16:48 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Jan 2016 16:48:11 +0000 (16:48 +0000)

Trivial merge