Added default expiry date to one hour for providers that don't return expires field
Merge branch 'develop'