55c7f1 Merge branch 'packaging' into master

Merged and Committed by Michal Kubecek a year ago
    Merge branch 'packaging' into master
    
        
file modified
+2 -2