facdf55 Merge most changes from the upstream spec file

Authored and Committed by rharwood 8 years ago
    Merge most changes from the upstream spec file
    
        
file modified
+23 -4