FORGE-1936: Update to Roaster 2.6.1-SNAPSHOT