Commit d5ba941f authored by Andreas Marek's avatar Andreas Marek

Merge branch 'new_fix' into 'master_pre_stage'

New fix

See merge request !19
parents a6ada278 c80e1e27