Merge branch 'bug_352_fix_some_cutlist_bugs'