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