Merge pull request #858 from BUG1989/patch-1 #1858

Job	Run time
build	20m 35s
test (push)	1m 33s
test (commit)	1m 0s
test-optional (gitown, manual)	1m 23s
test-optional (check-external-links, manual)	1m 29s
deploy	1m 0s
	27m 0s

Provide feedback