e2-60 and 61, djb
Merge pull request #266 from SGA-Brookshire/master

e2-60 and 61, djb