2.0.5: Configuration sync tweaks

latest commit 53638873bb
@tomgidden authored