Replace naive datetimes with its aware equivalent
Merge branch 'fix-expires-in'