Fixes some fiddliness with keyframe form input interactions.
Merge branch 'master' into gh-pages