Fixed build
Merge pull request #2991 from WouterJ/build_error

[2.1] Fixed Build errors
Merge branch '2.1' into 2.2

Conflicts:
	reference/constraints/UniqueEntity.rst