Merge branch 'master' of github.com:JuliaLang/julia

Author: ViralBShah

base/subarray.jl

@@ -202,7 +202,7 @@ function translate_indexes(s::SubArray, I::Union(Real,AbstractArray)...)
     j = 1
     for i = 1:ndp
         t = s.indexes[i]
-        if s.strides[j] == sp[i]
+        if j <= nds && s.strides[j] == sp[i]
             #TODO: don't generate the dense vector indexes if they can be ranges
             if j==n && n < nds
                 newindexes[i] = translate_linear_indexes(s, j, I[j])

test/arrayops.jl

@@ -99,6 +99,9 @@ sA = sub(A, 2, 1:5, 1:8)
 sA[2:5:end] = -1
 @test all(sA[2:5:end] .== -1)
 @test all(A[5:15:120] .== -1)
+sA = sub(A, 1:3, 1:5, 5)
+sA[1:3,1:5] = -2
+@test all(A[:,:,5] .== -2)
 
 # slice
 A = reshape(1:120, 3, 5, 8)