cf2fb88 rebase to go1.7rc5

Authored and Committed by jcajka 7 years ago
    rebase to go1.7rc5
    Resolves: BZ#1342090
    
        
file modified
+1 -0
file modified
+6 -2
file modified
+1 -1