Committing some minor code changes (mainly installer-related) I still had in my
3.6 source tree.