restore compatibility with numpy 1.6
Revert "restore compatibility with numpy 1.6"

This reverts commit 6e07c3ad5ef4f972f16b20999d931b60e05dfd53.
Merge remote-tracking branch 'upstream/development' into development