f9d54e3 merge branch f24

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