Merge branch 'release-0.2.6'