Merge remote-tracking branch 'origin/master' into numpy-array-view