Automatic database update
PR/230: make getline() public. file.c uses it.
Merge remote-tracking branch 'upstream/master'
merge with upstream