Fixes #3964 Adding opera
Merge remote-tracking branch 'origin/master'