Merge pull request #538 from paczian/master

fixed incompatibility with FF30