(cherry picked from commit 893b4f37) (cherry picked from commit c72399fb) Conflicts: timezone/Makefile