Return timestamp here so it can be easily fed to helper:date
Merge branch 'refs/heads/2.3/develop' into 3.0/develop