Merge branch 'MDL-53451-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 10:28:55 +0000 (11:28 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 10:28:55 +0000 (11:28 +0100)

Trivial merge