Sync'd branch integration/b2g-inbound with upstream @ Thu Aug 28 04:53:36 PDT 2014