Merge pull request #879 from EESN-W/e20c #1901

Job	Run time
test (commit)	1m 26s
test (push)	1m 29s
test-optional (check-external-links, manual)	1m 28s
build	21m 14s
test-optional (gitown, manual)	37s
deploy	3s
	26m 17s

Provide feedback