[ltrace/f17: 4/4] Merge branch 'master' into f17