Merging upstream version 0.9.7.