Merge branch 'nick_jtime/master'
Stop threads using ExecutorFactory
Merge branch 'github.com/master'