Sync'd branch integration/b2g-inbound with upstream @ Mon Aug 25 18:14:35 PDT 2014