Remove PushTask
Remove unused variable (osx)
Merge websocket and timeline start/stop tasks
Merge branch 'master' into builds
7.330