The -s option now works for most of the actions
Merge branch 'master' of github.com:cotdsa/cumulus