Merge branch 'issue/140' into 'development'

SCRUM#126 - Add a test option to windows

See merge request !98
7 jobs for development in 22 minutes and 27 seconds (queued for 3 seconds)