Merge remote-tracking branch 'ccutrer/dev/max_db_connections'

diff --cc doc/config.txt
Simple merge

diff --cc src/loader.c
Simple merge

diff --cc src/objects.c
Simple merge