fixed oversight in previous commit that caused FireFox fix not to be applied (#fixes 99)
Merge remote-tracking branch 'upstream/master'