Fix: avoid to include not desired directory
Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	build/exe/doliwamp/doliwamp.iss