Merge branch 'akoepsel/devel-0.5/testing' of https://github.com/bisdn/rofl-core into akoepsel/devel-0.5/testing
Merge branch 'akoepsel/devel-0.5/working' into akoepsel/devel-0.5/testing
Merge branch 'akoepsel/devel-0.5/working' into akoepsel/devel-0.5/testing
coxmatch => clean-up output operator after changes to class hierarchy caddress (part 2)