Merge remote-tracking branch 'origin/maxstepin-fixed-disasm' into xml

Conflicts:
	src/apngasm.cpp