Merge branch 'release-2.4.1'

version 2.4.0

version 2.4.0-rc3

Official release tag 2.3.0

Official release tag 2.2.0

Merging release-2.2.0 to master

Conflicts:
	CMakeLists.txt
	swig/doc.i
	swig/doc_merged.i
	swig/internal.i
	test/python/typemaps.py

Update README.md