452f80f rebase to latest upstream version (20171024)

Authored and Committed by dkaspar 4 years ago
    rebase to latest upstream version (20171024)
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1