4c4435 Merge remote-tracking branches 'origin/packaging' and 'origin/scripts' into stable

Merged and Committed by Jiri Slaby a year ago
    Merge remote-tracking branches 'origin/packaging' and 'origin/scripts' into stable
    
        
file modified
+25 -12
file modified
+1 -1