Changes for latest testswarm
Merge branch 'dev-testswarm' into v0.9.6.134
Merge pull request #11 from marcfallowsbb/v0.9.6.134

v0.9.6.134