[READY] Merge master into v2.x (please don't squash commits!) #382

Job	Run time
rubocop	8s
Unit test (ubuntu-20.04, 3)	1m 44s
Unit test (ubuntu-20.04, 3.1)	1m 55s
Unit test (ubuntu-20.04, 3.2)	1m 46s
Unit test (ubuntu-20.04, 3.3)	1m 43s
Unit test (ubuntu-20.04, jruby-9.4)	2m 39s
Unit test (ubuntu-20.04, truffleruby)	3m 53s
Unit test (macos-latest, 3)	1m 36s
Unit test (macos-latest, 3.1)	1m 32s
Unit test (macos-latest, 3.2)	1m 51s
Unit test (macos-latest, 3.3)	1m 39s
Unit test (macos-latest, jruby-9.4)	2m 1s
Unit test (macos-latest, truffleruby)	2m 36s
Unit test (windows-latest, 3)	3m 16s
Unit test (windows-latest, 3.1)	3m 21s
Unit test (windows-latest, 3.2)	2m 49s
Unit test (windows-latest, 3.3)	3m 46s
finish	0s
	38m 15s

Provide feedback