Updating to latest masters

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

* origin/master:
  Updating to latest masters

Change-Id: If3d6ce9fdfe9cb0efe898e6263f381503794996f
Updating node_modules

Change-Id: I88664041141ec66f2269a477891eab3a479e7a16