Merge branch '2808_freebsd6_build_failure' into 4.8.1-stable