Merged from the refactoring branch. Needs user tested, and better documented; but its stable enough that I'm committing it.
This commit is contained in:
parent
b371f35cfc
commit
72e3a24c22