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