ae4007 Update to the latest master

Authored and Committed by atkac 7 years ago
    Update to the latest master
    
    Signed-off-by: Adam Tkac <vonsch@gmail.com>
    
        
file modified
+1 -0
file modified
+10 -8
file modified
+1 -1