BUG: Concatenate with axis None should work regardless of matching array shapes
TST: Add test for concatenate with None-axis

Conflicts:
	numpy/core/tests/test_shape_base.py
Merge pull request #3275 from dieterv77/fix-concat-1.7.x

Backport fix for np.concatenate with axis=None