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