Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 04:25:39 PDT 2014