Merging upstream version 0.5.5. (Closes: #636093)