Merge branch 'bug_246_cutlistedit'