Pull request to resolve #6936