Merge pull request #471 from hotosm/feature/updateAndRefactor #76

Job	Run time
build-and-test / check-img-cache	2s
build-and-test / test-img-build / build-image	6m 37s
build-and-test / test-img-build / scan-image	0s
build-and-test / run-tests	5m 35s
	12m 14s

Provide feedback