MUTCAT_TROGLOBITE synchro

One merge conflict that won't be happening.