Backed out changeset 550419ca6ff9 (bug 1017759)
Backed out changeset f94bcc62fb6b (bug 1017759) for test timeouts
merge default -> production

--HG--
branch : production