Added optional patch to remove all database features.
Merge remote-tracking branch 'origin/unstable' into unstable