Merge pull request #1555 from jflyper/bfdev-cms-keyrepeat