This includes the changes in 1.6.17, a security release. PR: 209534 Approved by: mat (ports committer) Security: CVE-2016-2860