merged master back to jarodwen/hotfix/issue363