fix moment timezone bug
rebase from master