Merge pull request #917 from EESN-W/cm4_new #1964

Job	Run time
test-optional (gitown, manual)	1m 18s
test (commit)	1m 0s
test-optional (check-external-links, manual)	1m 53s
build	6m 34s
test (push)	1m 2s
deploy	1m 17s
	13m 4s

Provide feedback