backs out proxxymixin work, r=nthomas
merges default -> production

--HG--
branch : production