Merge trunk fix for [ 1480341 ] Timezone Bug

Benjamin Mako Hill || Want to submit a patch?