Merging upstream version 0.8.1.