Merge branch '3.0-dev' into 3.0 (0.2.2)