back out rev: 68e2addfaf61 bug: 1040926
merging default -> production

--HG--
branch : production