merged master back to jarodwen/hotfix/issue425 to support long counts
4 files changed