Final 3.0.y Merge

* Goodbye old friend!