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