Helping out by merging/solving conflicts in the open MRs #23
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.
This PR has exactly the same content as #21.
The only difference here is that the merged commits have been rebased and fast-forwarded instead, to make the main branch look cleaner, and not littered with merge commits.
I've ensured the commit information is preserved as much as possible, such that the work from @abougouffa to merge the features is correctly addressed and dated.
Refs
#11
#15
#18
#19