a3aa4b0 merge changes from F16, update and cleanup spec

Merged and Committed by pbrobinson 8 years ago
    merge changes from F16, update and cleanup spec
    
        
file modified
+1 -9
file modified
+19 -10