Fixing seleniums, as this does not work with new browser
Merge remote-tracking branch 'origin/b-3.1' into b-3.1