Merge pull request #936 from EESN-W/orion_o6_new #2000

Job	Run time
build	6m 25s
test-optional (check-external-links, manual)	1m 3s
test-optional (gitown, manual)	49s
test (push)	1m 0s
test (commit)	2m 16s
deploy	3m 30s
	15m 3s

Provide feedback