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