prefix/suffix always sent when specified
Merge remote-tracking branch 'remotes/threeme3/master'

Conflicts:
	wspr