Merging upstream version 0.5.3.