GIT: Fix merge
GIT: Fix merge

kaspermarstal/SimpleElastix,kaspermarstal/SimpleElastix,kaspermarstal/SimpleElastix,kaspermarstal/SimpleElastix,kaspermarstal/SimpleElastix,kaspermarstal/SimpleElastix,kaspermarstal/SimpleElastix