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