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