Update for 0.6.11
Merge branch 'release/0.6.11' into develop