Testing|hack, issue #1009: Update make hack environment