We merge this ahead of FreeBSD, mostly to make use of the builtin fixes for LibreSSL builds. Many thanks to Bernard Spil for his work on this!!! Taken from: https://reviews.freebsd.org/D2637
Taken from: https://github.com/freebsd/freebsd-ports.git Commit id: 5070672073b68be364139bc6b3a89100bd17d331