Competition between fast- and slow-diffusing species in non-homogeneous environments