682256b Cherry-pick patch for 0.23.0 support

Authored and Committed by ignatenkobrain 8 years ago
    Cherry-pick patch for 0.23.0 support
    
    Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
    
        
file modified
+15 -6