Merge branch '0.6.0' - docs [ci skip]