Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 19:53:52 PDT 2014