Fix Debian startup problem
Merge branch 'develop'