Less logging (osx)
Wait for active tasks to finish when shutting down (osx)
Merge branch 'master' into builds
7.216