Merge branch 'timer/cleanup' into late/mvebu2