Merge branch 'rotary-encoder' into next