Note that most of the content of this commit where written by Delia Menitti (see #395) - thank you :)
The original PR was not merged because there were some strange merge conflicts. In the end it was simpler to make a new branch (this one) and copy the changes from PR #395
Note that most of the content of this commit where written by Delia Menitti (see #395) - thank you :)
The original PR was not merged because there were some strange merge conflicts. In the end it was simpler to make a new branch (this one) and copy the changes from PR #395