Merge branch 'backup_bump' of git://github.com/stronk7/moodle