Merge branch 'MDL-52589-m' of https://github.com/micaherne/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jan 2016 15:31:23 +0000 (15:31 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:03 +0000 (09:31 +0000)

Trivial merge