d56740f Rebase to 4.7.4

Authored and Committed by msekleta 9 years ago
    Rebase to 4.7.4
    
    Resolves: #1214753
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+4 -1