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