Merge with Django 1.6.5
Bug fix for timefield