Use Calendar.today to get current date

Maybe this will fix the timezone related build failures?
Merge branch 'time'