Ensure that both dates are aware before substracting
Merge branch 'fix-expires-in'