6c59e50 rebase with upstream 1.1.5

Authored and Committed by imcleod 10 years ago
    rebase with upstream 1.1.5
    
        
file modified
+1 -0
file modified
+35 -65
file modified
+1 -1