MFH: r388201

Security update to 1.6

PR: 198955
Security: cc7548ef-06e1-11e5-8fda-002590263bf5
Security: CVE-2014-9556
Security: cfb12f02-06e1-11e5-8fda-002590263bf5
Security: CVE-2015-2060
Submitted by: Jason Unovitch <jason unovitch gmail com>
Reported by: Sevan Janiyan <venture37 geeklan co uk>
Approved by: ports-secteam