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