Merge pull request #941 from EESN-W/cm3j #2013

Job	Run time
test-optional (gitown, manual)	3m 19s
test (push)	2m 23s
test-optional (check-external-links, manual)	46s
test (commit)	2m 0s
build	6m 16s
deploy	1m 6s
	15m 50s

Provide feedback