Merge pull request #942 from EESN-W/x4 #2012

Job	Run time
build	6m 8s
test (commit)	2m 30s
test-optional (gitown, manual)	2m 35s
test-optional (check-external-links, manual)	2m 24s
test (push)	5m 0s
deploy	1m 16s
	19m 53s

Provide feedback