Thanks for your efforts ! 
Sadly, Windows 10 is giving me the biggest headache by simply not accepting being used as a development environment, so I can’t compile your merged branch right now.
I hope I can fix this soon, so I can finally start working again. ^^
I also noticed you merged in Cataclysm, I gotta say that was fast.