Fix coverage version conflict.
Merge remote-tracking branch 'upstream/master' into django1.6+_special_timeout_values
special timeout values tests (test_locmem only)