e3a8ef Include the patch.

Authored and Committed by twaugh 5 years ago
    Include the patch.
    
    (cherry picked from commits 44dc073686ded183a3e6530bfbfe6308f3d272ea
    and 1bcc7be6ea06b515b0aae75de92feb190cdcb82b)
    
        
file added
+14
file modified
+2 -2