Merge branch 'devel'
prompt detection fun...
Merge branch 'master' of github.com:radical-cybertools/saga-python