Merge "Don't write out cargo.out if it wasn't generated." into main