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