As per DarkSide666 Suggestion for backwards compatability
Merge remote-tracking branch 'origin/fix-inconsistency-m3z' into personal-changes-m3z

Yay