8627714 rebase to v0.99.5

Authored and Committed by rsroka 7 years ago
    rebase to v0.99.5
    
        
file modified
+1 -0
file modified
+9 -2
file modified
+1 -1