Fixed duration counter.
Merge branch 'master' into public