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