d6569c1 Update to git snapshot of 3.1

Authored and Committed by mbooth 9 years ago
    Update to git snapshot of 3.1
    
        
file modified
+5 -2
file modified
+1 -1