Merge branch 'master' into senslab2