committed from linux(ubuntu)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	freebsdmemo.txt
merged changed