Merge branch '0.9'
Merge branch 'master' of github.com:sara-nl/beehub_client
Merge branch 'laura'