Add timehooks for some languages
Merge branch 'master' into mac