fix for debian (will break pipy)
Merge branch 'master' into debian