Closed andrewharvey closed 4 years ago
closes #353
manually resolved conflicts and rebased against master
closes #353