6to4 merge

Not sure why this didn't get merged ages ago. :)