Fix problems with shut down CTs.
Merge branch 'master' of github.com:mxbossard/scripts