Fixes service.sh stop
Merge branch 'master' into drobofs