55ccc3f Pull two fixes from upstream to make it build.

Authored and Committed by tmraz 7 years ago
    Pull two fixes from upstream to make it build.
    
        
file modified
+151 -0
file modified
+1 -1