Merge branch 'upstreammaster' into senslab2