Fixing the annoying exceptions when running patches.

Conflicts:
	nzedb/build/nZEDb.xml
Merge branch 'master' of github.com:nZEDb/nZEDb
Merge remote-tracking branch 'upstream/master'