Table listing no longer left behind after backup
Fixed undefined variable errors
Fixed readability check
Merge branch 'master' into 6.0