Patch OK for master branch? I did not see any obvious issues to exclude 
LLP64 specifically.