Merge branch 'freebsd-docs' into 'develop'