Merge branch 'jarodwen/hotfix/issue396' with updated wiki pages and the fix for issue 396.