Merge remote-tracking branch 'origin/master' into tests
Merge branch 'tests' of github.com:sara-nl/BeeHub into tests