836d0a4 Update to latest upstream

Authored and Committed by Stanislav Ochotnicky 9 years ago
    Update to latest upstream
    
    - Fix handling of non-string arguments for scripts
    
        
file modified
+1 -0
file modified
+6 -2
file modified
+1 -1