Merge upstream.
Release v3.0.1.