Note that commit 7b832895 itself is currently not in netduke32_main; This requires a separate merge from mainline EDuke32.