3e68951 Fix bad merge

Authored and Committed by Radomir Dopieralski 5 years ago
    Fix bad merge