Rename default.conf instead of removing it.
Merge branch 'bugfixes'