Fix #2071
* Implemented with proposed fix * Future-proofing for newer major releases
J
Janne Kujanpää committed
d4cfadbbd78217f75eb79c1060109973e4dd9fb8
Parent: 5985739
* Implemented with proposed fix * Future-proofing for newer major releases