Comment 1 for bug 920961

The first commit is already in the precise version (we track the unstable serie), I've backported the three commits for the second issue (the one you pointed and the following up fixes commits)