Sync'd branch integration/b2g-inbound with upstream @ Mon Aug 25 20:16:34 PDT 2014