Fix typo in error message
Merge remote-tracking branch 'upstream/master' into fetch_haxby
Code sintax simplification