Merge branch 'maint-0.3.5' into maint-0.4.1

diff --cc .travis.yml
Simple merge

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

diff --cc src/feature/relay/router.c
Simple merge

diff --cc src/test/test_config.c
Simple merge