Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  1 02:58:43 PDT 2014