Start/Stop button on timer state change
Merge branch 'master' into builds
7.717