Merge 1.6 branch recent into master [TODO: SoundUpdater, OreDict]