bootstrap: improve backup
Merge remote branch 'origin/master'