Merge pull request #3290 from mpasternacki/bugfix/freebsd-build