Version bump
Merge branch 'release/0.6.14' into develop