Commit 413c30b5 authored by Lukas Riedel's avatar Lukas Riedel

Merge branch '1.1-bugfix-prep' into '1.1-stable'

Bugfix update to v1.1.1

See merge request !90
parents a06afc4f fa6182b1