Merge branch 'master' into sourceforge-bug-50

Conflicts:
	src/network.c