Merge the v5 1.7.10 branch into trunk

Preparing for starting work on Minechem v6.

This may be really painful to merge.