Don't re-comment out settings.
Imported Upstream version 0.3.2
Merge tag 'upstream/0.3.2'

Upstream version 0.3.2
New upstream version.
Imported Upstream version 0.3.3
Merge tag 'upstream/0.3.3'

Upstream version 0.3.3
Updated changelog for new upstream version.
Imported Upstream version 0.3.4
Merge tag 'upstream/0.3.4'

Upstream version 0.3.4
Updated changelog for new upstream version.
Added DB migration.