Merging upstream version 0.4.0.