Update with latest upstream.

Signed-off-by: John Hopper john.hopper@jpserver.net