Merge many Debian changes since January and update Makefile system