We are at 9.3-RELEASE now.
Merge remote-tracking branch 'origin/master' into freebsd10

Conflicts:
	build/nano_env