update everything
Merge branch '3.0.0'