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