Merge branch 'release/1.0.5'
! An annoying –but harmless– fatal error was shown on upgrade from older versions