Update tamer.
Merge branch 'master' into e

Conflicts:
	mpfd.thh