Code Cleanup
Portability

- Attempt 4 to eliminate build warning without causing problems.
Merge branch '2.4.0' of ssh://git.tasktools.org/tm/task into 2.4.0

Conflicts:
	ChangeLog