more merges for GPLv3 update