Merging upstream version 0.5.3 (Closes: #805659 CVE-2015-8308).