Merge branch 'dev' of github.com:cedadev/ceda-di into dev