Merge branch 'patch-2.1'
Fixed an indentation error.

It is not clear why this error did NOT lead to wrong results. This
version is definitely correct, though (from an algorithm point of view).
Merge branch 'hotfix/patch-2.2' into develop

Conflicts:
	EncryptionMatrix.py