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