V3

Upstream, also Opera fixes.