Merge branch 'MDL-52738' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 14:47:45 +0000 (14:47 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 14:47:45 +0000 (14:47 +0000)

Trivial merge