Merge branch 'work/innosetup' into devel