Fix a merge misstake
Merge branch 'fix-for-1bpp-png' into release-0.22

Conflicts:
	converters/stb_image.h
Merge branch 'release-0.22' into develop