Merge branch 'master' of github.com:/dmorse/simpatico
Merge branch 'master' into devel