Merge latest from upstream/master

Merge latest from upstream and remove a Firefox workaround which seems not be required anymore. See 86b1a59d53cbf65b5b354d44952f9ec7209e512c and 2f5985db6c0687c6054d2291f6c49d318b4625bb.