fixes: https://github.com/csirtgadgets/massive-octo-spice/issues/95
Merge branch 'develop'