Merge "Fix backup script derp" into mm6.0