dba5d01 Update f26 branch to master

Authored and Committed by yzhang 6 years ago
    Update f26 branch to master
    
    Also fix some naming issues.
    
    Signed-off-by: Yu Qi Zhang <jzehrarnyg@gmail.com>
    
        
file modified
+7 -4
file modified
+1 -12
file modified
+0 -2
file modified
+1 -0