aa9127 Merge branch 'master' into f21

Merged and Committed by till 5 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	hxtools.spec
    
        
file modified
+2 -0
file modified
+17 -9
file modified
+2 -1