Fixes issue where keyframe millisecond editing was broken.
Merge branch 'master' into gh-pages