Merge remote-tracking branch 'origin/master' into array_swap_docstring