merge master StoryFragmentEdit