Merging upstream version 0.5.6 (Closes: #683146).