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