Sync'd branch integration/b2g-inbound with upstream @ Mon Aug 25 12:04:27 PDT 2014