Merging upstream version 0.6.1.