Merged with upstream

I rebased from upstream as there was a commit and push from Antoni which was omitted from your merge request.

Merge this before you merge to the main upstream.