fixes #558 backup path issues
Merge branch 'master' into feature_759_cleanup