Merge branch 'develop'. This is v0.8.