Fix src/config.h once more.
Merge branch 'release_0_4'