Benedikt Ritter Sun, 02 Oct 2016 14:37:46 -0700
Hello Pascal, no I think I'll be able to resolve the conflicts when I merge the release branch.
Thank you!