Merge branch '0.7' of github.com:bruderschaft/fest into 0.7