7/1 patch

[Newby]

As always, diffs are against what's in subversion, not any of my previous patches.

[Ben8472]

thanks alot for your work! working perfectly here!

[skynyrd]

Thank you

[Ben8472]

7/22 broke this one :(