Put the release notes into place for nightlies (or any release)
Merge remote-tracking branch 'origin/master' into freebsd10

Conflicts:
	Makefile