Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 02:24:28 PDT 2014