Some tweaks to RC4 to no avail.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Some tweaks to RC4 to no avail.