Import from SQLite check-in 6484fb5a25.
Merge branch 'master' into refresh

Conflicts:
	lemon.c