Merge branch 'master' of github.com:mitshel/sopds into v0.39-devel