rebase melee hatchet to fix #814