Merge branch 'MDL-52738-fixup' of https://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Jan 2016 11:42:29 +0000 (11:42 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Jan 2016 11:42:29 +0000 (11:42 +0000)

Trivial merge