Fix likely double-delete errors triggered by James' patch commit 77fc2bdf back in April.
Merge branch 'merge-from-standard' into ncn-devel
Revise transfer time /transshipment time calculations to provide much greater granularity.
Fix transfer times on reload.