Merge from trunk at revision 182206. This merge is still susceptible to PR 51554, but it does not affect many builds. I'll just pick up Jason's fix in the next merge. Tested on x86_64. Diego.