0.6.13
Merge branch 'release/0.6.13' into support/0.6.x
v0.6.13