Finally merge chan_skinny fixes into trunk.