Set timer edit view tab order (osx)
Dont use timeout with locks
Merge branch 'master' into builds
7.225