This sync's down to my play branch JMG's crypto
changes. He will be committing these through other
channels some day so this branch will have to wait
(if it ever goes anywhere) until those are sync'd down.