merge `master` with slight conflicts fixed #1615

Sign in to view logs

Run time

Learn about OS pricing on GitHub Actions

Job	Run time
Build (ubuntu-latest, 4.12.1)	11m 54s
Build (ubuntu-latest, 4.13.1)	11m 25s
Build (ubuntu-latest, 4.14.0)	11m 23s
Build (macos-latest, 4.12.1)	11m 27s
Build (macos-latest, 4.13.1)	18m 21s
Build (macos-latest, 4.14.0)	16m 7s
	1h 20m 37s