Merge branch 'wip-MDL-50851-backupfix' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Jan 2016 12:35:18 +0000 (12:35 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Jan 2016 12:35:18 +0000 (12:35 +0000)

Trivial merge