Changing year to a Time.now call
Merge branch 'master' into steveG