 Merge branch 'sprint-10/dd-364' into 'builds/unstable'
 Merge branch 'sprint-10/dd-364' into 'builds/unstable'

Sprint 10/Dd 364

knutwalker/dswarm,dswarm/dswarm,dswarm/dswarm,janpolowinski/dswarm,philbritton/dswarm,zazi/dswarm,zazi/dswarm,knutwalker/dswarm,zazi/dswarm,philbritton/dswarm,janpolowinski/dswarm,dswarm/dswarm,knutwalker/dswarm,philbritton/dswarm