add support for the "custom" backup format
Merge branch 'develop'