Merge branch 'master' of github.com:saga-project/saga-pilot
Merge branch 'master' of github.com:saga-project/saga-pilot
add hotel to cfg
Merge branch 'master' of github.com:saga-project/saga-pilot
port fix from saga-python
merge