Merge a fix to release-0.1