942fca0 merge fisher's pull request