FIX allow ndim>2 in shuffle

Fixes #3694.
TST stronger test_shuffle_on_ndim_equals_three
Merge branch 'pr/3696'

Fixes #3696.