Merge branch 'MDL-53988-master-fix2' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 19 May 2016 09:56:01 +0000 (10:56 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 19 May 2016 09:56:01 +0000 (10:56 +0100)

Trivial merge