Yet another bugfix. Test before you commit!
Yet another bugfix. Test before you commit!

sheldon/epgp,ceason/epgp-tfatf,protomech/epgp-dkp-reloaded,sheldon/epgp,protomech/epgp-dkp-reloaded,ceason/epgp-tfatf,hayword/tfatf_epgp,hayword/tfatf_epgp