Merge branch 'fix-NormSqFunctional' into 'master'

Fix behavior of `NormSqFunctional` for non-zero imaginary parts.

See merge request !1
3 jobs for master in 47 seconds