New effort 'Let's fix this shit'
Merge branch 'master' into debian
5.0.6-1