Trying chromium as main browser again.
Merge remote-tracking branch 'upstream/master'