Merge commit '1095efe41feed8ea5a6fe5ca123c347ae0914801'Approved by: philip (mentor)Sponsored by: Alpha-Omega Beach Cleaning ProjectSponsored by: The FreeBSD Foundation