Updating to latest masters

Deployed new service (f0f6951d09e570ef114567a0ca6e3180af0553d9):
* Force images to be 600x600 pixels maximum.

Deployed new bundler (7296508d17f6634490cf079cb0fe03c175ff4ace):
* Fix "image size too big" check.

Change-Id: Ie5795d5f93bc70184d4b27eb885e8032268d7bb3
Merge branch 'master' into wmf-deploy

Change-Id: I26ce74d34d6a8d1af5fdb14bedefd3837747c3b2