Expire can accept a timedelta value
Merge branch 'asherf-timedelta' into develop