Fixed a potential issue introduced in 1.17.4 that causes an 'NS_ERROR_FAILURE' error in Firefox (fixes #100).
Merge remote-tracking branch 'upstream/master'