Fixes #116. Click handler broken on Firefox.
Merge remote-tracking branch 'upstream/master'