add workaround for MPoD timeout
Merge branch 'master' into debian