rebase pull request #1446 (use graph timezone rather than JVM timezone)