f97504 Merge remote-tracking branch 'origin/master' into f17

Merged and Committed by kevin 7 years ago
    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	calibre.spec
    
        
file modified
+3 -0
file modified
+14 -5
file modified
+1 -1