Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 20:15:38 PDT 2014