BUG: Fix IndexError: too many indices with numpy 1.8
Merge pull request #2383 from cgohlke/patch-1

BUG: Fix IndexError: too many indices with numpy 1.8