partial trapping moves [three to six] -> [four to five]
Merge pull request #428 from Komari/master

partial trapping moves [three to six] -> [four to five]