More robust test
Merge branch 'develop' into debian