Update to new snapshot.

Note I didn't take the original patch because it needed to NOT conflict
with itself, and I had to fix indentation - be sure to use TAB, not
blanks, after the VARIABLE= part.

PR: 219305
Submitted by: ecrist@secure-computing.net (maintainer)