Updating with bugfixes

Change-Id: I95550dceba63ae4b14fd9a93bf5127d4749035c0
Updated to latest masters

Change-Id: Id46d9ba05c769c285863befd3e27269c8cee7ef1
Merge remote-tracking branch 'origin/master' into wmf-deploy

* origin/master:
  Updated to latest masters
  Updating with bugfixes

Change-Id: I55f6b2357a452b58bdfe597d573db4c61928cbf9