Bug 1100759 - Upgrade runner; r=jlund
merge default -> production

--HG--
branch : production