Tested x86_64-linux. OK for trunk?