Merge branch 'issue/128' into 'development'

Issue SCRUM#128: Add new option to windows installer

See merge request !100
7 jobs for development in 23 minutes and 28 seconds (queued for 3 seconds)