This update is mostly bug fixes.
Includes: CVE-2016-4979 and CVE-2016-5387 and is why I merged from master.
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 7707dd5bc8)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Derek Straka