Merge branch 'develop' into sandbox
Merge branch 'sandbox' into fix-for-1bpp-png
Apply the fix for 1bpp PNG (adb44619) again
Bump version
Merge branch 'fix-for-1bpp-png' into release-0.22
Merge branch 'release-0.22' into release
Merge branch 'release' into develop