Merge branch 'stable/9' of github.com:yaneurabeya/freebsd into stable/9
Merge branch 'stable/9' into stable-9-atf