Re-sync mainly for licence updates.

Other redundant commits are just the result of an hazardous merge (result is exactly the same though, I checked).