Merge branch 'pr278_squashed'

diff --cc src/app/config/config.c
Simple merge

diff --cc src/core/mainloop/connection.c
Simple merge

diff --cc src/core/mainloop/main.c
Simple merge

diff --cc src/test/include.am
Simple merge