Merge branch 'bug-19480-NoINFandNaN' of https://phabricator.mitk.org/diffusion/MITK/mitk into bug-19480-NoINFandNaN