ENH: Use array_subscript_asarray to ensure an array type return value
ENH: Move Python related subscript code into array_subscript
ENH: Rename array_subscript to array_subscipt_fromobject and refactor array_subscript_nice to array_subscript

Conflicts:
	numpy/core/src/multiarray/mapping.c
ENH: Change silent integer conversion failure into index error.
ENH: Optimization in subscript_simple for arrays with size > 1
ENH: Rename array_ass_big_item to array_ass_item_object
ENH: Cleanup subscript assignment code.

Conflicts:
	numpy/core/src/multiarray/mapping.c
BLD: Declare array_ass_item_object before use.
ENH: Small optimization for redundant PyArray_Check

Conflicts:
	numpy/core/src/multiarray/mapping.c
BUG: Tuple conversion may not propagate errors from int conversion.

Conflicts:
	numpy/core/src/multiarray/mapping.c
ENH: Optimize array_subscript by removing redundant error check.
ENH: Change IndexError to ValueError for integer conversion errors.

Conflicts:
	numpy/core/src/multiarray/mapping.c
TST: Add more indexing tests.
BUG: Multiple fixes from merging.
STY: Text changes.

Conflicts:
	numpy/core/src/multiarray/mapping.c
BUG: Fix old case for boolean subscripts with non-matching shape.

Conflicts:
	numpy/core/src/multiarray/mapping.c
DOC: Re-insert comment
BUG: Fix failing subscript test cases

This fixes indexing with NumPy boolean scalar values, which caused
crashes before. Both Python and NumPy boolean scalars now behave the
same. This contains a few small changes to PyArrayMapIterNew, where
the PyArrayMapIterObject is memset to zero and a fix for the crash,
which was caused by _nonzero_indices, which did not initialize any
iterators because ndim is zero for scalars. *IterNew will now check
for scalars before running that part of the code.
BUG: Repair tests

Oops..
ENH: Add exception to _nonzero_indices for zero-dim arrays

This function causes a crash otherwise, because it loops over the number
of dimensions to construct sub-iterators. If the number of dimensions is
zero, the sub-iterators will not be initialized, causing problems later on.