62cea02 Merge branch 'master' into f21

Merged and Committed by pghmcfc 6 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	libssh2.spec
    
        
file modified
+13 -39
file modified
+1 -1