Sync'd branch integration/b2g-inbound with upstream @ Thu Aug 28 07:43:39 PDT 2014