merge with upstream master
Merge branch 'master' of github.com:jdgeddes/shadow