Merge branch 'master' into rotated

Switch the build system to the current one with database

Conflicts:
	LGC/metamake.rb
	Makefile
	mkcfinfo.rb
	mkmkfile.rb