Merge branch 'maint-0.4.5' into maint-0.4.6

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

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

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