Merge remote-tracking branch 'richardpl/framestep'