5a434b4 - update from trunk with fix for #1117799

Authored and Committed by sharkcz 9 years ago
    - update from trunk with fix for #1117799
    
        
file modified
+8 -1