Backport

https://github.com/pcbsd/pcbsd/commit/18c6ea0a5c07fba0f2819e2113c9b024e609646b

To releng/10.0