Changed merged from Marlinespike.