Make the timer larger on the data controller.
Merge remote-tracking branch 'origin/master'