Merge branch 'cb/no-more-gmtime'