Merge branch 'MDL-52638_m31v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jan 2016 11:36:14 +0000 (11:36 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jan 2016 11:36:14 +0000 (11:36 +0000)

Trivial merge