Small bug fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/Win32/Debug/x2dd.lib
	build/Win32/Release/x2d.lib