[ltrace/f17] (4 commits) ...Merge branch 'master' into f17