b5d7363 merge branch f24 into f25

Merged and Committed by Alex Kashchenko 7 years ago
    merge branch f24 into f25