Merge branch 'master' into sourceforge-bug-56

Conflicts:
	src/network.c