Django 1.6 test runner rules adopted.
Merge remote-tracking branch 'origin/master'