Using 3.0.0 stable.
Merge branch '1.7' into 1.8