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