this should fix https://github.com/integrity-tf/integrity/issues/27
Merge branch 'v0.11.x_bugfix' into v0.11.x