Remove whitespace
Merge remote-tracking branch 'upstream/master' into astropy-samp