Merge branch 'master' into dev_5.0

Conflicts:
	src/ChangeLog
	src/global.h
	src/runoff.c