Ok, merged with trunk and resolved conflicts by refactoring. All tests pass :)
« Back to merge proposal
Ok, merged with trunk and resolved conflicts by refactoring.
All tests pass :)