Merge branch '0.2.x'