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