Merge pull request #922 from valentinewallace/update-default-expiry