Merge branch 'tags' into dev
v0.10