fe23a11 Pull changes from upstream master (3bb932c)

Authored and Committed by pkubat 6 years ago
    Pull changes from upstream master (3bb932c)
    
        
file modified
+1 -8