Merged with GPLv3