commit: Merge, restoring Ben's GPLv3 manual changes.