Merge branch '0.10'