Minor fix
Merge branch 'master' into sandbox

Conflicts:
	src/output.c
Merge branch 'release-1.0'
Merge branch 'master' into stb_image
Update stb_image.h version to 1.44
Add an applied patch file for original stb_image.h
Merge branch 'master' into sandbox
Merge branch 'stb_image' into sandbox
Merge branch 'sandbox' into release-1.0