More packaging changes including the addition of the icon decoder for windows Merge several trunk bug fixes over.