Pre tag/0.4.3 3.0.x

I made a mistake when creating the 3.0.x release branch. Reapplying the changes from #208.