Merge branch 'fix-2d-eigenvalues-code' into 'master'

Christoph Grüningerrequested to merge
cherry-pick-d39401f2 into releases/2.5

Fix 2d eigenvalues code

See merge request !205 (merged)

Merge request reports