1b12ea4 Rebase to latest upstream gitrev 20180125

Authored and Committed by pnemade 6 years ago
    Rebase to latest upstream gitrev 20180125
    
        
file modified
+1 -1
file modified
+5 -2