In 11.0-RELEASE-p1.

I merged them here: https://svnweb.freebsd.org/base?view=revision&revision=30637...