Release 0.6.12.1

Merge release-0.6.12.1 into master.