b6d49d3 Rebase to latest upstream

Authored and Committed by msekleta 7 years ago
    Rebase to latest upstream
    
    Resolves: #1365128
    
        
file modified
+1 -3
file modified
+9 -3
file added
+10
file modified
+1 -4