Merge remote-tracking branch 'origin/master'

Conflicts:
	Win32/Release/Unit19.dcu
	Win32/Release/Unit2.dcu
	Win32/Release/asu.exe
	asu.identcache