Fix FF26 compatibility.
Merge pull request #876 from ochameau/fix-26

Fix FF26 compatibility.