Merge in Saeldur's timer changes