Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #913 and #914.
Note that this is based on (my) branch fix-898-4.1 (#917), so merging it will merge that one as well. This also means it is more difficult to review, so I recommend reviewing the commits (a0ccba1 and 23aecae) themselves. I did this because the test changes compound on the other branch. If #917 is rejected, I will rebase this against develop.
Please review and merge if satisfactory.