Changed all other methods to use moment too.
Merge branch 'time-zone'