Further work on installers.
Merge branch 'next' into nfs_change