Bug 1080792: screenresolution 1.6 still works on Yosemite, luckiliy; r=whimboo
Bug 1080645: no '.' allowed in crontask names; r=jwatkins
Merge default -> production

--HG--
branch : production