Merge branch 'add-freebsd-ci' into 'master'