Merge branch 'version-0.13.0'