Updating to masters

Change-Id: I6adf1edb03448e6efd7dd978eb7242f312394c3e
Updating to latest masters

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

Change-Id: Iafdb6629bc515bcb30a8149619c16d47d7dc5d32