Merge branch 'motionfixes' into danzimm