#4 Merge fix for Firefox 20 detection from master