Fix up GPL license.
Port to 1.7