@vmaljulin Please review.
rebased onto 74163fcf391bd9bd02841a712b99c6c2b1c7c61c
I've bumped the future release date. I'll do the release on Monday if I have the time.
+1
Pull-Request has been merged by lholecek