fix for https://github.com/bgruening/docker-galaxy-stable/issues/13 and https://github.com/bgruening/docker-galaxy-stable/issues/12
Merge branch 'master' of https://github.com/bgruening/docker-galaxy-stable