Hi, this is to fix the remaining bit of the PR. Tested x86_64-linux. Ok for mainline (and then 4_2 and 4_1)? ////////////////////