Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 22 06:47:52 PDT 2014