Include contents of /etc/resolv.conf in bug report
Merge branch '3.0' into 3.2
Merge branch '3.2'

Conflicts:
	main/core/ChangeLog