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