Fix for retaining option values

Added an not very forward compatibly upgrade function that retains all
the old values. New settings will always be set to false.
Merge branch 'hotfix-settings'