Tested, no negative effects seen
Merge pull request #371 from twitter/feature/use_local_or_Shuffle

Tested, no negative effects seen