Elide terminal "f" in "if and only iff".
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md (manually merge)