Merge commit from fork #4680

Job	Run time
lint	58s
audit	20s
msrv	30s
test (ubuntu-latest, stable)	1m 12s
test (ubuntu-latest, beta)	1m 38s
test on freebsd	5m 2s
test (macos-latest, stable)	1m 27s
test (windows-latest, stable)	3m 44s
features (ubuntu-latest)	5m 9s
test-android (x86_64-linux-android, x86_64, 26)	5m 35s
features (macos-latest)	3m 46s
test-android (i686-linux-android, x86, 26)	4m 4s
features (windows-latest)	8m 51s
	42m 16s

Provide feedback