Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  1 04:13:46 PDT 2014